Remove *.res files in mostlyclean, to avoid problems with out-of-tree builds.

 src/Makefile.in (mostlyclean): Remove *.res files.

 lib-src/Makefile.in (mostlyclean): Remove *.res files.

 nt/Makefile.in (emacs.res): Include srcdir when preprocessing
 resources, for out-of-tree builds.
 (mostlyclean): Remove *.res files.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b6a1e9a3009f5bee0eb1bcd001b53d3e56ba695a..ea424d87c6f643a0bf0307f3b44e5672df1b8f26 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port --enable-gcc-warnings to clang.

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index e0acea867b70652cfacdff1876b5900d82d752ef..f32333fe765fda366a66f0e664f6b2118451d52e 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -278,7 +278,7 @@ uninstall:
        fi
 
 mostlyclean:
-       -rm -f core *.o
+       -rm -f core *.o *.res
 
 clean: mostlyclean
        -rm -f ${EXE_FILES}

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 27fc1ac9acb03a9a6e6c9f728d0cf07e148e2107..6e05ccea6ffa573fa7f6bb2141e68435372ee288 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (emacs.res): Include srcdir when preprocessing
+       resources, for out-of-tree builds.
+       (mostlyclean): Remove *.res files.
+
 2013-05-17  Eli Zaretskii  <eliz@gnu.org>
 
        * runemacs.c (WinMain): Support invocation of un-installed

diff --git a/nt/Makefile.in b/nt/Makefile.in
index 3d5e1ca084cac92e4a382a0ec7fd98a1a9cc4d36..7f68a1b83ad283599aac6f09dda73e33dac3d703 100644 (file)
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -168,7 +168,7 @@ uninstall:
        fi
 
 mostlyclean:
-       -rm -f core *.o
+       -rm -f core *.o *.res
 
 clean: mostlyclean
        -rm -f ${EXE_FILES}
@@ -209,4 +209,4 @@ runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
          -o runemacs${EXEEXT}
 
 emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST)
-       ${WINDRES} -O coff -o emacs.res ${srcdir}/emacs.rc
+       ${WINDRES} -I ${srcdir} -O coff -o emacs.res ${srcdir}/emacs.rc

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d9f1234d5f7c12a071104897bd2851747d533f3..e0e473c0a22517299549a5e92fc4a6bb03fe2fe5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * fileio.c (Finsert_file_contents): Preserve undo info when reverting

diff --git a/src/Makefile.in b/src/Makefile.in
index c7a18363a5a24c5ead61b86084f102ba56320c4c..2fa7fb373489a822ae6f9e0de3fa7977f36e56b6 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -547,6 +547,7 @@ mostlyclean:
        rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
        rm -f buildobj.h
        rm -f globals.h gl-stamp
+       rm -f *.res
 clean: mostlyclean
        rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT)
        -rm -rf $(DEPDIR)